* lisp/vc/vc.el (vc-revert-file): Don't set file time-stamp in the past.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9fd1984b10774f3b432c40b21415032be63c4480..dda3efb1f1eafb485b0b851d9a5c187910437272 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-13  Sergei Organov  <osv@javad.com>  (tiny change)
+
+       * vc/vc.el (vc-revert-file):
+       Don't set file time-stamp in the past.  (Bug#5181)
+
 2011-07-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * files.el (after-find-file): Give a better error message when

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 796311f8f661f9bda81f90f78d727fbeaf529e28..6704a43e59ba06b005dea287ed55e15cb9bf6da8 100644 (file)
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2428,7 +2428,7 @@ its name; otherwise return nil."
    (list file)
    (let ((backup-file (vc-version-backup-file file)))
      (when backup-file
-       (copy-file backup-file file 'ok-if-already-exists 'keep-date)
+       (copy-file backup-file file 'ok-if-already-exists)
        (vc-delete-automatic-version-backups file))
      (vc-call revert file backup-file))
    `((vc-state . up-to-date)